Drop ::button-press/release event

We are no longer using these, and there are several gestures
that can be used instead. If you need to catch raw button events,
use the ::event signal.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e09e0d34d522ec4bc9761b9e3c29a27843625391..3508838e2b832281d3248bd3d843a1ab8c5ceb5b 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -489,8 +489,6 @@ enum {
   MOVE_FOCUS,
   KEYNAV_FAILED,
   EVENT,
-  BUTTON_PRESS_EVENT,
-  BUTTON_RELEASE_EVENT,
   KEY_PRESS_EVENT,
   KEY_RELEASE_EVENT,
   DRAG_BEGIN,
@@ -606,8 +604,6 @@ static gboolean _gtk_widget_run_controllers      (GtkWidget           *widget,
 static void    gtk_widget_dispatch_child_properties_changed    (GtkWidget        *object,
                                                                 guint             n_pspecs,
                                                                 GParamSpec      **pspecs);
-static gboolean         gtk_widget_real_button_event            (GtkWidget        *widget,
-                                                                 GdkEventButton   *event);
 static gboolean                gtk_widget_real_key_press_event         (GtkWidget        *widget,
                                                                 GdkEventKey      *event);
 static gboolean                gtk_widget_real_key_release_event       (GtkWidget        *widget,
@@ -986,8 +982,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->move_focus = gtk_widget_real_move_focus;
   klass->keynav_failed = gtk_widget_real_keynav_failed;
   klass->event = NULL;
-  klass->button_press_event = gtk_widget_real_button_event;
-  klass->button_release_event = gtk_widget_real_button_event;
   klass->key_press_event = gtk_widget_real_key_press_event;
   klass->key_release_event = gtk_widget_real_key_release_event;
   klass->drag_begin = NULL;
@@ -1883,64 +1877,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   g_signal_set_va_marshaller (widget_signals[EVENT], G_TYPE_FROM_CLASS (klass),
                               _gtk_marshal_BOOLEAN__OBJECTv);
 
-  /**
-   * GtkWidget::button-press-event:
-   * @widget: the object which received the signal.
-   * @event: (type Gdk.EventButton): the #GdkEventButton which triggered
-   *   this signal.
-   *
-   * The ::button-press-event signal will be emitted when a button
-   * (typically from a mouse) is pressed.
-   *
-   * To receive this signal, the #GdkWindow associated to the
-   * widget needs to enable the #GDK_BUTTON_PRESS_MASK mask.
-   *
-   * This signal will be sent to the grab widget if there is one.
-   *
-   * Returns: %TRUE to stop other handlers from being invoked for the event.
-   *   %FALSE to propagate the event further.
-   */
-  widget_signals[BUTTON_PRESS_EVENT] =
-    g_signal_new (I_("button-press-event"),
-                 G_TYPE_FROM_CLASS (klass),
-                 G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
-                 G_STRUCT_OFFSET (GtkWidgetClass, button_press_event),
-                 _gtk_boolean_handled_accumulator, NULL,
-                 _gtk_marshal_BOOLEAN__OBJECT,
-                 G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
-  g_signal_set_va_marshaller (widget_signals[BUTTON_PRESS_EVENT], G_TYPE_FROM_CLASS (klass),
-                              _gtk_marshal_BOOLEAN__OBJECTv);
-
-  /**
-   * GtkWidget::button-release-event:
-   * @widget: the object which received the signal.
-   * @event: (type Gdk.EventButton): the #GdkEventButton which triggered
-   *   this signal.
-   *
-   * The ::button-release-event signal will be emitted when a button
-   * (typically from a mouse) is released.
-   *
-   * To receive this signal, the #GdkWindow associated to the
-   * widget needs to enable the #GDK_BUTTON_RELEASE_MASK mask.
-   *
-   * This signal will be sent to the grab widget if there is one.
-   *
-   * Returns: %TRUE to stop other handlers from being invoked for the event.
-   *   %FALSE to propagate the event further.
-   */
-  widget_signals[BUTTON_RELEASE_EVENT] =
-    g_signal_new (I_("button-release-event"),
-                 G_TYPE_FROM_CLASS (klass),
-                 G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
-                 G_STRUCT_OFFSET (GtkWidgetClass, button_release_event),
-                 _gtk_boolean_handled_accumulator, NULL,
-                 _gtk_marshal_BOOLEAN__OBJECT,
-                 G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
-  g_signal_set_va_marshaller (widget_signals[BUTTON_RELEASE_EVENT], G_TYPE_FROM_CLASS (klass),
-                              _gtk_marshal_BOOLEAN__OBJECTv);
-
   /**
    * GtkWidget::key-press-event:
    * @widget: the object which received the signal
@@ -5703,13 +5639,6 @@ gtk_widget_draw (GtkWidget *widget,
   cairo_restore (cr);
 }
 
-static gboolean
-gtk_widget_real_button_event (GtkWidget      *widget,
-                              GdkEventButton *event)
-{
-  return GDK_EVENT_PROPAGATE;
-}
-
 static gboolean
 gtk_widget_real_key_press_event (GtkWidget         *widget,
                                 GdkEventKey       *event)
@@ -6042,14 +5971,10 @@ gtk_widget_emit_event_signals (GtkWidget      *widget,
        case GDK_GRAB_BROKEN:
        case GDK_FOCUS_CHANGE:
        case GDK_MOTION_NOTIFY:
-       case GDK_NOTHING:
-         signal_num = -1;
-         break;
        case GDK_BUTTON_PRESS:
-         signal_num = BUTTON_PRESS_EVENT;
-          break;
        case GDK_BUTTON_RELEASE:
-         signal_num = BUTTON_RELEASE_EVENT;
+       case GDK_NOTHING:
+         signal_num = -1;
          break;
        case GDK_KEY_PRESS:
          signal_num = KEY_PRESS_EVENT;

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index c2767925837b3b5c790af805a67627f2e8a5c4fb..bd64d24636e8c2213d18c7c40dc4128104c8398a 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -196,10 +196,6 @@ struct _GtkWidget
  *   more specific, signal that matches the type of event delivered
  *   (e.g. "key-press-event") and finally a generic "event-after"
  *   signal.
- * @button_press_event: Signal will be emitted when a button
- *   (typically from a mouse) is pressed.
- * @button_release_event: Signal will be emitted when a button
- *   (typically from a mouse) is released.
  * @key_press_event: Signal emitted when a key is pressed.
  * @key_release_event: Signal is emitted when a key is released.
  * @drag_begin: Signal emitted on the drag source when a drag is
@@ -306,10 +302,6 @@ struct _GtkWidgetClass
   /* events */
   gboolean (* event)                   (GtkWidget           *widget,
                                         GdkEvent            *event);
-  gboolean (* button_press_event)      (GtkWidget           *widget,
-                                        GdkEventButton      *event);
-  gboolean (* button_release_event)    (GtkWidget           *widget,
-                                        GdkEventButton      *event);
   gboolean (* key_press_event)         (GtkWidget           *widget,
                                         GdkEventKey         *event);
   gboolean (* key_release_event)       (GtkWidget           *widget,